projects
/
ostree.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b3adfa8
)
Fix build error with --with-ed25519-libsodium and --with-openssl
author
Daiki Ueno
<dueno@redhat.com>
Mon, 24 Mar 2025 12:25:12 +0000
(21:25 +0900)
committer
Daiki Ueno
<dueno@redhat.com>
Mon, 24 Mar 2025 12:25:12 +0000
(21:25 +0900)
While libotcore can be configured with those options individually, the
latter is always required for OpenSSL's EVP functions. This splits the
ifdefs to accommodate that.
Signed-off-by: Daiki Ueno <dueno@redhat.com>
src/libotcore/otcore.h
patch
|
blob
|
history
diff --git
a/src/libotcore/otcore.h
b/src/libotcore/otcore.h
index ceeb1a9265501d27c2fbcef254b52575b980626f..3ce8f2a39f1aaa2c5503b883689f03f687bd1d71 100644
(file)
--- a/
src/libotcore/otcore.h
+++ b/
src/libotcore/otcore.h
@@
-25,7
+25,9
@@
#ifdef HAVE_LIBSODIUM
#include <sodium.h>
#define USE_LIBSODIUM
-#elif defined(HAVE_OPENSSL)
+#endif
+
+#if defined(HAVE_OPENSSL)
#include <openssl/evp.h>
#include <openssl/x509.h>
#define USE_OPENSSL